//
//  ViewController.m
//  GitDemo
//
//  Created by menchao on 2018/7/31.
//  Copyright © 2018年 cedarhd. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@property (nonatomic,strong) NSString *str;


@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    // Do any additional setup after loading the view, typically from a nib.
}


- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

- (void)devTest{
    NSLog(@"dev分支修改");
}

- (void)dev2Test{
    NSLog(@"dev2Test 分支");
}


- (void)test1_Rebase{
     NSLog(@"testRebase 测试1");
}

- (void)testMerge{
     NSLog(@"testMerge 测试2");
}

- (void)fromDev{
    NSLog(@"来自Dev分支的修改");
}



@end
